Fix previous conflict.
authorKenichi Handa <handa@etlken>
Wed, 14 Jul 2010 03:53:53 +0000 (12:53 +0900)
committerKenichi Handa <handa@etlken>
Wed, 14 Jul 2010 03:53:53 +0000 (12:53 +0900)
commit228f19f57439bf1224ff1e5b3501620188c373bf
treee13a2f7bad710efb72a99d5208903a59adb25117
parent7706b7c92426c3d6e04ffd8edb8e8c1d370afae2
Fix previous conflict.
src/ChangeLog